From f93cf125f00b79defaf48c39a866d6481d9e3483 Mon Sep 17 00:00:00 2001 From: Raymond Penners Date: Thu, 1 Jul 2004 21:30:16 +0000 Subject: [PATCH] Button icons configurable, 0.6.1 --- modules/engines/ms-windows/ChangeLog.old | 8 ++++++++ modules/engines/ms-windows/Theme/gtk-2.0/gtkrc | 1 + modules/engines/ms-windows/msw_style.c | 6 ------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/engines/ms-windows/ChangeLog.old b/modules/engines/ms-windows/ChangeLog.old index 8020b9bbea..4e6b0a5a33 100755 --- a/modules/engines/ms-windows/ChangeLog.old +++ b/modules/engines/ms-windows/ChangeLog.old @@ -1,3 +1,11 @@ +2004-07-01 Raymond Penners + + * === Released 0.6.1 === + + * src/msw_style.c,src/Theme/gtk-2.0/gtkrc: Removed hard-coded icon + button blocking. It is now configurable from within the gtkrc + file, but still disabled by default. + 2004-06-02 Dom Lachowicz * src/msw_style.c: Disable icons in buttons diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc index 5ee4374575..4411c6e347 100755 --- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc +++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc @@ -1,5 +1,6 @@ # TODO: we should probably obtain these from a Win32 IconMetrics struct gtk-icon-sizes="gtk-menu=12,12:gtk-small-toolbar=12,12:gtk-large-toolbar=16,16:gtk-dnd=32,32" +gtk-button-images=0 style "msw-default" { diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index 14ec5ab2fe..e0050af158 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -453,12 +453,6 @@ setup_menu_settings (GtkSettings * settings) if (osvi.dwMajorVersion == 4 && osvi.dwMinorVersion == 0) win95 = TRUE; - if (klazz) { - if (g_object_class_find_property (klazz, "gtk-button-images")) { - g_object_set (G_OBJECT (settings), "gtk-button-images", 0, NULL); - } - } - if (!win95) { if (SystemParametersInfo (SPI_GETMENUSHOWDELAY, 0, &menu_delay, 0)) { if (klazz) { -- 2.30.2